From ac7e9e7ce3a1628fd3f9f64af57719f50c6d3af7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 14:46:34 +0100 Subject: [PATCH] d/rules: Defang dh_auto_test when built with nocheck --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index e12bd6597d..d555cea473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium * d/p/testsuite-Install-accessibility-dump-executable-alongside.patch: Install accessibility-dump in installed-tests so one more test can pass * libgtk-4-0.postrm.in: Remove the correct cache files + * d/rules: Defang dh_auto_test when built with nocheck -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/rules b/debian/rules index 953e9bd31f..20c36d7385 100755 --- a/debian/rules +++ b/debian/rules @@ -163,6 +163,7 @@ ifneq ($(filter %-udeb,$(binaries)),) endif override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # Mark reftests with known failures as non-fatal touch testsuite/reftests/nonresizable-size.ui.known_fail touch testsuite/reftests/window-show-contents-on-map.ui.known_fail @@ -174,6 +175,7 @@ override_dh_auto_test: glib-compile-schemas debian/build/glib-2.0/schemas/ # Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail env -u LD_PRELOAD dh_auto_test --builddirectory=debian/build/deb -- -k check -j1 || true +endif override_dh_auto_install: dh_auto_install --builddirectory=debian/build/deb --destdir=debian/install/deb -- 2.30.2